From bd083922f9e78ed19ef98e7de372e5f568402ed3 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Tue, 26 Aug 2014 17:56:52 +0200 Subject: [PATCH] x86/IO-APIC: don't process softirqs during early boot Commit e13b320399 ("x86/irq: process softirqs in irq keyhandlers") made this unconditional, but the boot time use of __print_IO_APIC() (when "apic_verbosity=debug" was given) can't tolerate that. Reported-by: Sander Eikelenboom Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Tested-by: Sander Eikelenboom --- xen/arch/x86/io_apic.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 1b576365dd..6f8f62cd71 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -1092,7 +1092,7 @@ static inline void UNEXPECTED_IO_APIC(void) { } -static void /*__init*/ __print_IO_APIC(void) +static void /*__init*/ __print_IO_APIC(bool_t boot) { int apic, i; union IO_APIC_reg_00 reg_00; @@ -1113,7 +1113,8 @@ static void /*__init*/ __print_IO_APIC(void) printk(KERN_INFO "testing the IO APIC.......................\n"); for (apic = 0; apic < nr_ioapics; apic++) { - process_pending_softirqs(); + if ( !boot ) + process_pending_softirqs(); if (!nr_ioapic_entries[apic]) continue; @@ -1219,7 +1220,7 @@ static void /*__init*/ __print_IO_APIC(void) for (i = 0; i < nr_irqs_gsi; i++) { struct irq_pin_list *entry = irq_2_pin + i; - if ( !(i & 0x1f) ) + if ( !boot && !(i & 0x1f) ) process_pending_softirqs(); if (entry->pin < 0) @@ -1242,12 +1243,12 @@ static void /*__init*/ __print_IO_APIC(void) static void __init print_IO_APIC(void) { if (apic_verbosity != APIC_QUIET) - __print_IO_APIC(); + __print_IO_APIC(1); } static void _print_IO_APIC_keyhandler(unsigned char key) { - __print_IO_APIC(); + __print_IO_APIC(0); } static struct keyhandler print_IO_APIC_keyhandler = { .diagnostic = 1, -- 2.30.2